From: Eric Abrahamsen <eric@ericabrahamsen.net>
Date: Mon, 19 Feb 2024 02:08:51 +0000 (-0800)
Subject: Back out part of commit db5e84af202
X-Git-Tag: archive/raspbian/1%30.1+1-3+rpi1^2~14^2~18^2~2501
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=f6743099cc907f1f2847f028ff8f3712288c559f;p=emacs.git

Back out part of commit db5e84af202

* lisp/gnus/gnus-agent.el (gnus-category-make-function-1): This code is
untested and was not meant to be part of the earlier commit.
---

diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el
index 0928b179787..1726b806913 100644
--- a/lisp/gnus/gnus-agent.el
+++ b/lisp/gnus/gnus-agent.el
@@ -2920,9 +2920,8 @@ The following commands are available:
    ;; Functions are just returned as is.
    ((or (symbolp predicate)
 	(functionp predicate))
-    (let ((fun (or (cdr (assq predicate gnus-category-predicate-alist))
-	           predicate)))
-      (if (symbolp fun) `(,fun) `(funcall ',fun))))
+    `(,(or (cdr (assq predicate gnus-category-predicate-alist))
+	   predicate)))
    ;; More complex predicate.
    ((consp predicate)
     `(,(cond